Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFV1
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 69a377ca2910
Choose a base ref
...
head repository: FFmpeg/FFV1
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 210958c09df8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 8, 2017

  1. Copy the full SHA
    c43a167 View commit details
  2. bump to draft version 01

    dericed authored and michaelni committed Jan 8, 2017
    Copy the full SHA
    210958c View commit details
Showing with 9 additions and 9 deletions.
  1. +8 −8 Makefile
  2. +1 −1 rfc_frontmatter.md
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ HTML=$(SRC:.md=.html)
$(info PDF and HTML rendering has been tested with pandoc version 1.13.2.1, some older versions are known to produce very poor output, please ensure your pandoc is recent enough.)
$(info RFC rendering has been tested with mmark version 1.3.4 and xml2rfc 2.5.1, please ensure these are installed and recent enough.)

all: ffv1.html ffv1.pdf draft-niedermayer-cellar-ffv1-00.html draft-niedermayer-cellar-ffv1-00.txt
all: ffv1.html ffv1.pdf draft-niedermayer-cellar-ffv1-01.html draft-niedermayer-cellar-ffv1-01.txt

ffv1.html: ffv1.md
cat pdf_frontmatter.md "$<" pdf_backmatter.md > merged_ffv1html.md
@@ -15,15 +15,15 @@ ffv1.pdf: ffv1.md
cat pdf_frontmatter.md "$<" pdf_backmatter.md | sed "s|\[@!|\[|g;s|\[@?|\[|g;s|\[@|\[|g" > merged_ffv1pdf.md
pandoc --toc -s --number-sections --latex-engine=xelatex -V geometry:margin=1in --variable urlcolor=blue -o "$@" merged_ffv1pdf.md

draft-niedermayer-cellar-ffv1-00.html: ffv1.md
draft-niedermayer-cellar-ffv1-01.html: ffv1.md
cat rfc_frontmatter.md "$<" > merged_rfchtml.md
mmark -xml2 -page merged_rfchtml.md > draft-niedermayer-cellar-ffv1-00.xml
xml2rfc --html draft-niedermayer-cellar-ffv1-00.xml -o "$@"
mmark -xml2 -page merged_rfchtml.md > draft-niedermayer-cellar-ffv1-01.xml
xml2rfc --html draft-niedermayer-cellar-ffv1-01.xml -o "$@"

draft-niedermayer-cellar-ffv1-00.txt: ffv1.md
draft-niedermayer-cellar-ffv1-01.txt: ffv1.md
cat rfc_frontmatter.md "$<" > merged_rfctxt.md
mmark -xml2 -page merged_rfctxt.md > draft-niedermayer-cellar-ffv1-00.xml
xml2rfc draft-niedermayer-cellar-ffv1-00.xml -o "$@"
mmark -xml2 -page merged_rfctxt.md > draft-niedermayer-cellar-ffv1-01.xml
xml2rfc draft-niedermayer-cellar-ffv1-01.xml -o "$@"

clean:
rm -f ffv1.pdf ffv1.html draft-niedermayer-cellar-ffv1-00.txt draft-niedermayer-cellar-ffv1-00.html merged_ffv1html.md merged_ffv1pdf.md merged_rfchtml.md merged_rfctxt.md draft-niedermayer-cellar-ffv1-00.xml
rm -f ffv1.pdf ffv1.html draft-niedermayer-cellar-ffv1-0* merged_ffv1html.md merged_ffv1pdf.md merged_rfchtml.md merged_rfctxt.md
2 changes: 1 addition & 1 deletion rfc_frontmatter.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% Title = "FF Video Codec 1"
% abbrev = "FFV1"
% category = "std"
% docName = "draft-niedermayer-cellar-ffv1-00"
% docName = "draft-niedermayer-cellar-ffv1-01"
% ipr= "trust200902"
% area = "art"
% workgroup = "cellar"